projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 030df01 16ef753)
; Merge from origin/emacs-25
authorGlenn Morris <rgm@gnu.org>
Sun, 11 Jun 2017 23:20:41 +0000 (16:20 -0700)
committerGlenn Morris <rgm@gnu.org>
Sun, 11 Jun 2017 23:20:41 +0000 (16:20 -0700)
The following commits were skipped:

16ef7539cb3 Don't advertise s_client in tls.el docs
94a6c964a45 Remove s_client usage from tls.el


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.